From: ihy123 <aladinandreyy@gmail.com>
Date: Mon, 25 Aug 2025 08:17:06 +0000 (+0300)
Subject: ip/ffmpeg: change sample format conversions
X-Git-Tag: archive/raspbian/2.12.0-2+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=aeedb868eaba0de45a1d9ec50f312e7527475241;p=cmus.git

ip/ffmpeg: change sample format conversions


Gbp-Pq: Name 0015-ip-ffmpeg-change-sample-format-conversions.patch
---

diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
index 2cb0767..2d3c610 100644
--- a/ip/ffmpeg.c
+++ b/ip/ffmpeg.c
@@ -157,13 +157,11 @@ static void ffmpeg_set_sf_and_swr_opts(SwrContext *swr, AVCodecContext *cc,
 	av_opt_set_int(swr, "in_sample_rate", cc->sample_rate, 0);
 	av_opt_set_int(swr, "out_sample_rate", out_sample_rate, 0);
 
-	*out_sample_fmt = cc->sample_fmt;
-	switch (*out_sample_fmt) {
-		case AV_SAMPLE_FMT_U8:
-			sf |= sf_bits(8) | sf_signed(0);
-			break;
-		case AV_SAMPLE_FMT_S32:
+	switch (cc->sample_fmt) {
+		case AV_SAMPLE_FMT_FLT: case AV_SAMPLE_FMT_FLTP:
+		case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32P:
 			sf |= sf_bits(32) | sf_signed(1);
+			*out_sample_fmt = AV_SAMPLE_FMT_S32;
 			break;
 		default:
 			sf |= sf_bits(16) | sf_signed(1);